Skip to content

Main2Dev @W-22462053@ Merging main to dev after v1.22.0 - #372

Merged
nikhil-mittal-165 merged 9 commits into
devfrom
m2d/v1.22.0
Aug 26, 2026
Merged

nikhil-mittal-165 merged 9 commits into
devfrom
m2d/v1.22.0

Conversation

@svc-cli-bot

Copy link
Copy Markdown
Collaborator

This branch and PR were automatically created following the successful release of v1.22.0.
It must be MERGED into dev, NOT SQUASHED OR REBASED. Squashing or rebasing this branch onto dev can cause potentially irreconcilable merge conflicts later.
As an additional safeguard and reminder, the title of this PR MUST include the word 'merging' in the description portion of the PR title, e.g., 'Main2Dev @w-xxxxxx@ Merging main to dev after vX.Y.Z'.
If there are conflicts between dev and this branch, you should do the following locally:

  • $ git checkout dev
  • $ git pull
  • $ git fetch --all
  • $ git checkout m2d/v1.22.0
  • $ git pull origin dev --no-rebase # You MUST include this flag, or someone's day will be ruined.
  • Resolve the merge conflicts manually. When in doubt, ask the code's author for help.
  • $ git commit
  • $ git push

@git2gus

git2gus Bot commented Aug 26, 2026

Copy link
Copy Markdown

Git2Gus App is installed but the .git2gus/config.json doesn't have right values. You should add the required configuration.

@aruntyagiTutu aruntyagiTutu left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Content reviewed — this is the standard Main2Dev merge-back after the v1.22.0 release, aggregating already-reviewed dev commits (message sanitization #368, includeSuggestions default #369, dependency refresh #370, release #371) plus the PR-title-injection hardening fix mirrored from code-analyzer-core (passing head_ref/base_ref via env instead of ${{ }} interpolation, plus a new permissions: contents: read restriction on the workflow — good defense-in-depth addition). SHA256.md and version bump are consistent with prior releases. No code concerns.

Per the PR's own body, the title should be renamed to include 'merging' (e.g. 'Main2Dev @W-XXXXXXXX@ Merging main to dev after v1.22.0') before merge — currently still the placeholder 'Filler title. Read description and rename.'

@nikhil-mittal-165 nikhil-mittal-165 changed the title Filler title. Read description and rename. Main2Dev @W-22462053@ Merging main to dev after v1.22.0 Aug 26, 2026
# Conflicts:
#	.github/workflows/validate-pr.yml
#	SHA256.md

@aruntyagiTutu aruntyagiTutu left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Title has been renamed correctly and the PR-title-validation check now passes. Re-verified the diff after the dev→m2d merge-conflict resolution: SHA256.md and package.json correctly retain the released v1.22.0 hash/version, and the validate-pr.yml hardening (env-based head_ref/base_ref, permissions: contents: read) merged in cleanly with no regressions. CI is green. Approving.

@nikhil-mittal-165
nikhil-mittal-165 merged commit e569a3f into dev Aug 26, 2026
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants